From ba5fbdb32b4d10066b967bedcf709c1337d648e8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 9 Oct 2008 16:19:06 +0000 Subject: [PATCH] =?utf8?q?Bug=20555523=20=E2=80=93=20gtk=5Fscale=5Fbutton?= =?utf8?q?=5Fset=5Fadjustment=20should=20accept=20NULL?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * gtk/gtkscalebutton.c (gtk_scale_button_set_adjustment): Create a new adjustment if NULL is passed, like other widgets svn path=/trunk/; revision=21620 --- ChangeLog | 7 +++++++ gtk/gtkscalebutton.c | 20 +++++++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5402b6f1ca..8718708bce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-10-09 Christian Dywan + + Bug 555523 – gtk_scale_button_set_adjustment should accept NULL + + * gtk/gtkscalebutton.c (gtk_scale_button_set_adjustment): + Create a new adjustment if NULL is passed, like other widgets + 2008-10-09 Christian Dywan Bug 555578 – GtkTable propertiy maxima are wrong diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c index c70573bc93..b6933bc23c 100644 --- a/gtk/gtkscalebutton.c +++ b/gtk/gtkscalebutton.c @@ -678,16 +678,22 @@ gtk_scale_button_set_adjustment (GtkScaleButton *button, GtkAdjustment *adjustment) { g_return_if_fail (GTK_IS_SCALE_BUTTON (button)); - g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); + if (!adjustment) + adjustment = (GtkAdjustment*) gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + else + g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); - if (button->priv->adjustment) - g_object_unref (button->priv->adjustment); - button->priv->adjustment = g_object_ref_sink (adjustment); + if (button->priv->adjustment != adjustment) + { + if (button->priv->adjustment) + g_object_unref (button->priv->adjustment); + button->priv->adjustment = g_object_ref_sink (adjustment); - if (button->priv->scale) - gtk_range_set_adjustment (GTK_RANGE (button->priv->scale), adjustment); + if (button->priv->scale) + gtk_range_set_adjustment (GTK_RANGE (button->priv->scale), adjustment); - g_object_notify (G_OBJECT (button), "adjustment"); + g_object_notify (G_OBJECT (button), "adjustment"); + } } /** -- 2.30.2